Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Kraken: Rate limiting for backfilling and warning instead of error on API retries #216

Closed
wants to merge 30 commits into from

Conversation

crubb
Copy link
Contributor

@crubb crubb commented Jun 3, 2017

@DeviaVir

Addressing comments from #177.

Alexandre-io and others added 30 commits May 26, 2017 18:47
Some variables were incorrect
Fixing some misplaced variables
Added default config options, fix trade and error reporting
getOrder working, and properly(?) handling retries now
More error handling for recoverable/reconnect errors and trade
Merge branch 'feat/kraken' of https://github.com/Alexandre-io/zenbot into feat/kraken

Conflicts:
	extensions/kraken/exchange.js
…ed Kraken to README and removed ; at end of lines
@crubb
Copy link
Contributor Author

crubb commented Jun 3, 2017

Sorry, "dirty" branch.

@crubb crubb closed this Jun 3, 2017
@DeviaVir
Copy link
Owner

DeviaVir commented Jun 3, 2017

@crubb I would squash and merge so it's not a big difference to me. If you want to fix it (just in case you're not sure how):

git remote add upstream [email protected]:carlos8f/zenbot.git 
git fetch upstream
git checkout master
git merge --no-ff upstream/master
# master is now up to date with carlos8f
git checkout -b my-new-branch # or just git checkout your thing
git merge --no-ff master
# this either ends up in a bunch of conflicts (making it easier to just create a new branch entirely) or you will end up with a nice clean branch to push

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants